From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 19 Aug 2013 21:14:15 +0000 (+0200)
Subject: network: don't return null from NMConnectionDevice._getStatus()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3569
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5a9f0c24b407a4fddff2ac1a29357a8fc94a4d5e;p=gnome-shell.git

network: don't return null from NMConnectionDevice._getStatus()

StLabel complains set you set the text to NULL

https://bugzilla.gnome.org/show_bug.cgi?id=706262
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 376cb2c91..20157f4fa 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -352,12 +352,12 @@ const NMConnectionDevice = new Lang.Class({
 
     _getStatus: function() {
         if (!this._device)
-            return null;
+            return '';
 
         switch(this._device.state) {
         case NetworkManager.DeviceState.DISCONNECTED:
         case NetworkManager.DeviceState.ACTIVATED:
-            return null;
+            return '';
         case NetworkManager.DeviceState.UNMANAGED:
             /* Translators: this is for network devices that are physically present but are not
                under NetworkManager's control (and thus cannot be used in the menu) */